From: Glenn Morris <rgm@gnu.org>
Date: Wed, 20 Jun 2007 07:49:16 +0000 (+0000)
Subject: Move stray entry here from top-level changelog and reformat.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18314
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f28e97c7795bf935665a38c0c1f9d23b3d285455;p=emacs.git

Move stray entry here from top-level changelog and reformat.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c0935b982c..b31f7fce041 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -202,6 +202,11 @@
 
 	* vc-arch.el (vc-arch-command): Remove bzr.  It's a different program.
 
+2007-06-13  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+	* ediff-ptch.el (ediff-context-diff-label-regexp): Partially undo
+	previous change.
+
 2007-06-12  Tom Tromey  <tromey@redhat.com>
 
 	* subr.el (user-emacs-directory): New defconst.